Split off a private header for GtkTextBuffer

This avoids polluting the installed header with private symbols.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 88e30f89916cd959038d6f1573c550510a07f2af..83b3cd2ffddf3e0fa149893b0f90d4dd9315bbca 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -515,6 +515,7 @@ gtk_private_h_sources =             \
        gtkstyleproviderprivate.h \
        gtktextattributesprivate.h \
        gtktextbtree.h          \
+       gtktextbufferprivate.h \
        gtktextbufferserialize.h \
        gtktextchildprivate.h   \
        gtktexthandleprivate.h  \

diff --git a/gtk/a11y/gtktextviewaccessible.c b/gtk/a11y/gtktextviewaccessible.c
index f97c155d1d0568344e3a4ff55c441b9f8062a701..4adff0cb528e5052d2948f825c99d7b4a78b9a60 100644 (file)
--- a/gtk/a11y/gtktextviewaccessible.c
+++ b/gtk/a11y/gtktextviewaccessible.c
@@ -29,6 +29,7 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "gtktextviewaccessibleprivate.h"
+#include "gtktextbufferprivate.h"
 #include "gtk/gtkwidgetprivate.h"
 
 struct _GtkTextViewAccessiblePrivate

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index b7c54b07a0ee701b5b47feb2f22c3fa21ab569bc..2528730b59bbc4a6f5852caa4da7d0c10fe2e771 100644 (file)
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -58,6 +58,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include "gtktextbufferprivate.h"
 #include "gtktexttag.h"
 #include "gtktexttagprivate.h"
 #include "gtktexttagtable.h"

diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 1bf1b688238b5917ca702f677e3edd4f64f96ad1..e45f445bed3e78163859f9752c4a56dd8d2f6f3b 100644 (file)
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -33,6 +33,7 @@
 #include "gtkinvisible.h"
 #include "gtkmarshalers.h"
 #include "gtktextbuffer.h"
+#include "gtktextbufferprivate.h"
 #include "gtktextbufferrichtext.h"
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"

diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 9227be887411fa1b153b8982749171b214053de9..3183d3c391f8bd13bff2550e0a776f2f242dcd57 100644 (file)
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -468,33 +468,6 @@ GtkTargetList * gtk_text_buffer_get_copy_target_list    (GtkTextBuffer *buffer);
 GDK_AVAILABLE_IN_ALL
 GtkTargetList * gtk_text_buffer_get_paste_target_list   (GtkTextBuffer *buffer);
 
-/* INTERNAL private stuff */
-void            _gtk_text_buffer_spew                  (GtkTextBuffer      *buffer);
-
-GtkTextBTree*   _gtk_text_buffer_get_btree             (GtkTextBuffer      *buffer);
-
-const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
-                                                         const GtkTextIter *anywhere_in_line,
-                                                         gint              *char_len);
-
-void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
-                                              GtkTextTag    *tag);
-
-void _gtk_text_buffer_get_text_before (GtkTextBuffer   *buffer,
-                                       AtkTextBoundary  boundary_type,
-                                       GtkTextIter     *position,
-                                       GtkTextIter     *start,
-                                       GtkTextIter     *end);
-void _gtk_text_buffer_get_text_at     (GtkTextBuffer   *buffer,
-                                       AtkTextBoundary  boundary_type,
-                                       GtkTextIter     *position,
-                                       GtkTextIter     *start,
-                                       GtkTextIter     *end);
-void _gtk_text_buffer_get_text_after  (GtkTextBuffer   *buffer,
-                                       AtkTextBoundary  boundary_type,
-                                       GtkTextIter     *position,
-                                       GtkTextIter     *start,
-                                       GtkTextIter     *end);
 
 G_END_DECLS
 

diff --git a/gtk/gtktextbufferprivate.h b/gtk/gtktextbufferprivate.h
new file mode 100644 (file)
index 0000000..8d8363c
--- /dev/null
+++ b/gtk/gtktextbufferprivate.h
@@ -0,0 +1,55 @@
+/* GTK - The GIMP Toolkit
+ * gtktextbufferprivate.h Copyright (C) 2015 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_TEXT_BUFFER_PRIVATE_H__
+#define __GTK_TEXT_BUFFER_PRIVATE_H__
+
+#include <gtk/gtktextbuffer.h>
+
+G_BEGIN_DECLS
+
+
+void            _gtk_text_buffer_spew                  (GtkTextBuffer      *buffer);
+
+GtkTextBTree*   _gtk_text_buffer_get_btree             (GtkTextBuffer      *buffer);
+
+const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
+                                                         const GtkTextIter *anywhere_in_line,
+                                                         gint              *char_len);
+
+void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
+                                              GtkTextTag    *tag);
+
+void _gtk_text_buffer_get_text_before (GtkTextBuffer   *buffer,
+                                       AtkTextBoundary  boundary_type,
+                                       GtkTextIter     *position,
+                                       GtkTextIter     *start,
+                                       GtkTextIter     *end);
+void _gtk_text_buffer_get_text_at     (GtkTextBuffer   *buffer,
+                                       AtkTextBoundary  boundary_type,
+                                       GtkTextIter     *position,
+                                       GtkTextIter     *start,
+                                       GtkTextIter     *end);
+void _gtk_text_buffer_get_text_after  (GtkTextBuffer   *buffer,
+                                       AtkTextBoundary  boundary_type,
+                                       GtkTextIter     *position,
+                                       GtkTextIter     *start,
+                                       GtkTextIter     *end);
+
+G_END_DECLS
+
+#endif

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 6b31c6485c5a0b8ef5df17fa567200f1aeac36a5..a863c3868279be02523f66633ae698e4eff74e0a 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "gtktextiter.h"
 #include "gtktextbtree.h"
+#include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtkintl.h"
 #include "gtkdebug.h"

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index ffba509bcfdfb14c9c25b0eaec3ab354fc3547bb..e6a4ab9a6169cff016694f8f01312f347725fcd4 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -80,6 +80,7 @@
 #include "gtkmarshalers.h"
 #include "gtktextlayout.h"
 #include "gtktextbtree.h"
+#include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtktextattributesprivate.h"
 #include "gtktextutil.h"

diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index 777cf310bd9f1f306ee8a633637696ba6f26b644..42569cf16ba03145251d38c31a8e612be70af129 100644 (file)
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -29,7 +29,7 @@
 #include "gtkbuildable.h"
 #include "gtktexttagprivate.h"
 #include "gtkmarshalers.h"
-#include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */
+#include "gtktextbufferprivate.h" /* just for the lame notify_will_remove_tag hack */
 #include "gtkintl.h"
 
 #include <stdlib.h>